Version bump, drop old

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 19 insertions, 53 deletions

diff --git a/x11-themes/gnome-icon-theme/ChangeLog b/x11-themes/gnome-icon-theme/ChangeLog
index 267d1a41a400..69b0e02816a1 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.236 2013/04/09 16:45:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/ChangeLog,v 1.237 2013/05/13 20:23:44 pacho Exp $
+
+*gnome-icon-theme-3.8.2 (13 May 2013)
+
+  13 May 2013; Pacho Ramos <pacho@gentoo.org> +gnome-icon-theme-3.8.2.ebuild,
+  -gnome-icon-theme-2.30.3.ebuild, -gnome-icon-theme-3.4.0.ebuild:
+  Version bump, drop old
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> gnome-icon-theme-3.6.2.ebuild:
   Stable for sh, wrt bug #458984
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.30.3.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-2.30.3.ebuild
deleted file mode 100644
index e7baf6e2c1b2..000000000000
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-2.30.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/gnome-icon-theme-2.30.3.ebuild,v 1.9 2012/05/05 04:10:05 jdhore Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME 2 default icon themes"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-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
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	sys-devel/gettext"
-# Upstream didn't give us a ChangeLog with 2.30
-DOCS="AUTHORS NEWS TODO"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-# FIXME: double check potential LINGUAS problem
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-icon-mapping"
-}
diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.8.2.ebuild
index 350e46f14c54..1d6a60db52d3 100644
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.4.0.ebuild
+++ b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.8.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 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.4.0.ebuild,v 1.11 2013/02/07 22:50:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-icon-theme/gnome-icon-theme-3.8.2.ebuild,v 1.1 2013/05/13 20:23:44 pacho Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2 eutils autotools
+inherit gnome2
 
 DESCRIPTION="GNOME default icon theme"
 HOMEPAGE="http://www.gnome.org/ http://people.freedesktop.org/~jimmac/icons/#git"
@@ -16,30 +16,20 @@ SRC_URI="${SRC_URI}
 LICENSE="|| ( LGPL-3 CC-BY-SA-3.0 )
 	branding? ( CC-Sampling-Plus-1.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="branding"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
 DEPEND="${RDEPEND}
 	>=x11-misc/icon-naming-utils-0.8.7
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
-	virtual/pkgconfig"
-
+	virtual/pkgconfig
+"
 # 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 \
@@ -48,9 +38,11 @@ src_prepare() {
 		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"
+	gnome2_src_prepare
+}
 
-	eaclocal --force # workaround for weird autotools.eclass bug #438296, #419933
-	eautoreconf
+src_configure() {
+	gnome2_src_configure \
+		--enable-icon-mapping \
+		GTK_UPDATE_ICON_CACHE=$(type -P true)
 }