summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-03-23 05:08:19 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-03-23 05:08:19 +0000
commit0e3f4b2f678b3935c02547f42c2d9998588eee76 (patch)
tree3f12728f028d1367310213e236f5eac5c3374d69 /x11-themes/gnome-icon-theme
parentunmask dhcp-4 (diff)
downloadgentoo-2-0e3f4b2f678b3935c02547f42c2d9998588eee76.tar.gz
gentoo-2-0e3f4b2f678b3935c02547f42c2d9998588eee76.tar.bz2
gentoo-2-0e3f4b2f678b3935c02547f42c2d9998588eee76.zip
Bump to 2.91.92, remove old
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes/gnome-icon-theme')
-rw-r--r--x11-themes/gnome-icon-theme/ChangeLog8
-rw-r--r--x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.92.ebuild (renamed from x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.6.ebuild)18
2 files changed, 16 insertions, 10 deletions
diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog
index 8d6cb5158c54..12c7340537eb 100644
--- a/x11-themes/gnome-icon-theme/ChangeLog
+++ b/x11-themes/gnome-icon-theme/ChangeLog
@@ -1,6 +1,12 @@
# 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.195 2011/03/22 19:53:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.196 2011/03/23 05:08:19 nirbheek Exp $
+
+*gnome-icon-theme-2.91.92 (23 Mar 2011)
+
+ 23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ -gnome-icon-theme-2.91.6.ebuild, +gnome-icon-theme-2.91.92.ebuild:
+ Bump to 2.91.92, remove old
22 Mar 2011; Brent Baude <ranger@gentoo.org>
gnome-icon-theme-2.91.7.ebuild:
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.6.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.92.ebuild
index 4f09568bd286..52cc880b1b27 100644
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.6.ebuild
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.92.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.6.ebuild,v 1.2 2011/02/21 21:14:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-2.91.92.ebuild,v 1.1 2011/03/23 05:08:19 nirbheek 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
}