[gentoo-commits] proj/gnome:gnome-next commit in: x11-themes/gnome-icon-theme/files/, x11-themes/gnome-icon-theme/

[gentoo-commits] proj/gnome:gnome-next commit in: x11-themes/gnome-icon-theme/files/, x11-themes/gnome-icon-theme/

[Alexandre Restovtsev]

commit:     82dc163129d19c99c015d3cc315a8248c81180ce
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 22 22:41:47 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 22 22:41:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=82dc1631

x11-themes/gnome-icon-theme: add 3.1.4

Add gnome-3.1.x version, now with an .xz tarball.

---
 .../gnome-icon-theme-2.91.7-update-cache.patch     |   39 ++++++++++++++
 .../gnome-icon-theme/gnome-icon-theme-3.1.4.ebuild |   55 ++++++++++++++++++++
 2 files changed, 94 insertions(+), 0 deletions(-)

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 0000000..c7a6e46
--- /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-3.1.4.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.1.4.ebuild
new file mode 100644
index 0000000..03f19c3
--- /dev/null
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.1.4.ebuild
@@ -0,0 +1,55 @@
+# 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-3.0.0.ebuild,v 1.5 2011/07/17 21:25:33 maekke Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="GNOME default icon themes"
+HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
+
+SRC_URI="${SRC_URI}
+	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
+
+LICENSE="LGPL-3 CCPL-Attribution-ShareAlike-3.0
+	branding? ( CCPL-Sampling-Plus-1.0 )"
+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="branding"
+
+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() {
+	DOCS="AUTHORS NEWS TODO"
+	G2CONF="${G2CONF}
+		--enable-icon-mapping
+		GTK_UPDATE_ICON_CACHE=$(type -p true)"
+}
+
+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 \
+			"${S}"/gnome//${i}x${i}/places/start-here.png \
+			|| die "Copying gentoo logos failed"
+		done
+	fi
+
+	# 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
+}