Version bump for Gnome 3.6. Drop old revision.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 19 insertions, 19 deletions

diff --git a/x11-themes/gnome-icon-theme-extras/ChangeLog b/x11-themes/gnome-icon-theme-extras/ChangeLog
index 10a8e9e2dc40..30a2b8f874a6 100644
--- a/x11-themes/gnome-icon-theme-extras/ChangeLog
+++ b/x11-themes/gnome-icon-theme-extras/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/gnome-icon-theme-extras
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme-extras/ChangeLog,v 1.12 2012/10/04 15:06:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme-extras/ChangeLog,v 1.13 2012/12/16 19:30:39 eva Exp $
+
+*gnome-icon-theme-extras-3.6.2 (16 Dec 2012)
+
+  16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-icon-theme-extras-3.0.0.ebuild, +gnome-icon-theme-extras-3.6.2.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.6. Drop old revision.
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org>
   gnome-icon-theme-extras-3.4.0.ebuild:
diff --git a/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.0.0.ebuild b/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.6.2.ebuild
index 000423e2f28a..c419b5b67724 100644
--- a/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.0.0.ebuild
+++ b/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.6.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.0.0.ebuild,v 1.5 2012/07/05 17:57:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.6.2.ebuild,v 1.1 2012/12/16 19:30:39 eva Exp $
 
-EAPI="3"
+EAPI="5"
 GCONF_DEBUG="no"
 
-inherit autotools gnome2
+inherit gnome2
 
 DESCRIPTION="Extra GNOME icons for specific devices and file types"
 HOMEPAGE="http://www.gnome.org/ http://git.gnome.org/browse/gnome-icon-theme-extras/"
 
 LICENSE="CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
@@ -23,22 +23,15 @@ DEPEND="${RDEPEND}
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 # FIXME: double check potential LINGUAS problem
-DOCS="AUTHORS README NEWS"
-G2CONF="${G2CONF} --enable-icon-mapping"
 
 src_prepare() {
-	# Always use pre-rendered icons
-	sed -e 's/"x$allow_rendering" = "xyes"/"x$allow_rendering" = "xdonotwant"/' \
-		-i configure.ac -i configure || die
-	# Avoid maintainer-mode
-	eautoreconf
+	DOCS="AUTHORS README NEWS"
+	G2CONF="${G2CONF} --enable-icon-mapping"
 
 	gnome2_src_prepare
-}
 
-src_install() {
-	gnome2_src_install
-	# FIXME: 2.30.1 tries to install icon-theme.cache, recheck if still needed
-	# in future versions
-	rm -f "${ED}/usr/share/icons/gnome/icon-theme.cache" || die
+	# Always use pre-rendered icons
+	# FIXME: changing configure.ac triggers maintainer-mode rebuild
+	sed -e 's/"x$allow_rendering" = "xyes"/"x$allow_rendering" = "xdonotwant"/' \
+		-i configure || die
 }
diff --git a/x11-themes/gnome-icon-theme-extras/metadata.xml b/x11-themes/gnome-icon-theme-extras/metadata.xml
index da6fd63d0085..6e0e2ecb48ca 100644
--- a/x11-themes/gnome-icon-theme-extras/metadata.xml
+++ b/x11-themes/gnome-icon-theme-extras/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+  <herd>gnome</herd>
 </pkgmetadata>