Version bump adding speaker device icon and reverting upstream commit that was causing icon cache to be always regenerated even when unneeded (bug #351117 by Alex Buell). Remove old.

(Portage version: 2.1.9.40/cvs/Linux x86_64)

4 files changed, 58 insertions, 43 deletions

diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog
index 612e7dd5d59e..e8f67ebd3e64 100644
--- a/x11-themes/gnome-icon-theme/ChangeLog
+++ b/x11-themes/gnome-icon-theme/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/gnome-icon-theme
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.188 2011/02/02 11:15:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.189 2011/02/21 19:09:12 pacho Exp $
+
+*gnome-icon-theme-2.91.7 (21 Feb 2011)
+
+  21 Feb 2011; Pacho Ramos <pacho@gentoo.org> -gnome-icon-theme-2.31.0.ebuild,
+  -gnome-icon-theme-2.91.0.ebuild, +gnome-icon-theme-2.91.7.ebuild,
+  +files/gnome-icon-theme-2.91.7-update-cache.patch:
+  Version bump adding speaker device icon and reverting upstream commit that
+  was causing icon cache to be always regenerated even when unneeded (bug
+  #351117 by Alex Buell).
 
 *gnome-icon-theme-2.91.6 (02 Feb 2011)
 
diff --git a/x11-themes/gnome-icon-theme/files/gnome-icon-theme-2.91.7-update-cache.patch b/x11-themes/gnome-icon-theme/files/gnome-icon-theme-2.91.7-update-cache.patch
new file mode 100644
index 000000000000..c7a6e46e1ee3
--- /dev/null
+++ b/x11-themes/gnome-icon-theme/files/gnome-icon-theme-2.91.7-update-cache.patch
@@ -0,0 +1,39 @@
+From f71b86486f5b42821fad50f8cada03edd3eb07e2 Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw@gnome.org>
+Date: Thu, 23 Sep 2010 19:58:12 +0000
+Subject: Run gtk-update-icon-cache after installing
+
+https://bugzilla.gnome.org/show_bug.cgi?id=630465
+---
+diff --git a/Makefile.am b/Makefile.am
+index 693a3cc..2097ee2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -80,6 +80,9 @@ install-data-local:
+ 		touch $(DESTDIR)$(themedir); \
+ 	fi
+ 
++install-data-hook:
++	$(GTK_UPDATE_ICON_CACHE) -q $(DESTDIR)$(themedir)
++
+ pkgconfigdir = $(datadir)/pkgconfig
+ pkgconfig_DATA = gnome-icon-theme.pc
+ 
+diff --git a/configure.ac b/configure.ac
+index 6074f2c..0e7e3b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,6 +57,11 @@ fi
+ 
+ AC_SUBST(ICONMAP)
+ 
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
++if test -z "$GTK_UPDATE_ICON_CACHE"; then
++    AC_MSG_ERROR([Could not find gtk-update-icon-cache])
++fi
++
+ AC_CONFIG_FILES([
+ Makefile
+ gnome-icon-theme.pc
+--
+cgit v0.8.3.4
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.31.0.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.31.0.ebuild
deleted file mode 100644
index 74d5e7906f14..000000000000
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.31.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-2.31.0.ebuild,v 1.1 2010/10/22 20:25:51 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME 2 default icon themes"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.7
-	>=dev-util/pkgconfig-0.19
-	>=dev-util/intltool-0.40
-	sys-devel/gettext"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# FIXME: double check potential LINGUAS problem
-pkg_setup() {
-	# Upstream didn't give us a ChangeLog with 2.30
-	DOCS="AUTHORS NEWS TODO"
-	G2CONF="${G2CONF} --enable-icon-mapping"
-}
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.0.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.7.ebuild
index fad252b57748..54ef4f2f4d9c 100644
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.0.ebuild
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.0.ebuild,v 1.2 2011/01/08 11:05:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.7.ebuild,v 1.1 2011/02/21 19:09:12 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 eutils autotools
 
-DESCRIPTION="GNOME 2 default icon themes"
+DESCRIPTION="GNOME default icon themes"
 HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
 
 SRC_URI="${SRC_URI}
@@ -36,6 +36,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	gnome2_src_prepare
+
 	if use branding; then
 		for i in 16 22 24 32 48; do
 			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
@@ -43,11 +45,9 @@ src_prepare() {
 			|| die "Copying gentoo logos failed"
 		done
 	fi
-}
 
-src_install() {
-	gnome2_src_install
-	# FIXME: 2.91.0 tries to install icon-theme.cache, recheck if still needed
-	# in future versions
-	rm -f "${ED}/usr/share/icons/gnome/icon-theme.cache" || die
+	# Revert upstream commit that is wrongly updating icon cache, upstream bug #642449
+	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.91.7-update-cache.patch"
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 }