Re-add missing phase wrapping.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 12 insertions, 44 deletions

diff --git a/x11-themes/gnome-themes/ChangeLog b/x11-themes/gnome-themes/ChangeLog
index 18a82f255621..78c147652c76 100644
--- a/x11-themes/gnome-themes/ChangeLog
+++ b/x11-themes/gnome-themes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/gnome-themes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.231 2010/08/14 16:57:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.232 2010/08/16 21:41:55 eva Exp $
+
+  16 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-themes-2.24.3.ebuild, gnome-themes-2.30.2.ebuild:
+  Re-add missing phase wrapping.
 
   14 Aug 2010; Raúl Porcel <armin76@gentoo.org> gnome-themes-2.28.1.ebuild:
   alpha/ia64/sh/sparc stable wrt #314899
diff --git a/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild b/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild
deleted file mode 100644
index be705b494940..000000000000
--- a/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild
+++ /dev/null
@@ -1,40 +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-themes/gnome-themes-2.24.3.ebuild,v 1.13 2010/07/20 02:31:21 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A set of GNOME themes, with sets for users with limited or low vision"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2
-	 >=x11-themes/gtk-engines-2.15.3"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.0
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable accessibility all-themes)
-		--enable-legacy-icon-mapping"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix bashisms, bug #256337
-	epatch "${FILESDIR}/${P}-bashism.patch"
-}
diff --git a/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild b/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild
index a7ae992986b5..b34171bd23ce 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild,v 1.4 2010/08/01 11:22:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.30.2.ebuild,v 1.5 2010/08/16 21:41:55 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x8
 IUSE="accessibility"
 
 RDEPEND=">=x11-libs/gtk+-2
-	 >=x11-themes/gtk-engines-2.15.3"
+	>=x11-themes/gtk-engines-2.15.3"
 DEPEND="${RDEPEND}
 	>=x11-misc/icon-naming-utils-0.8.7
 	>=dev-util/pkgconfig-0.19
@@ -28,12 +28,16 @@ DOCS="AUTHORS ChangeLog NEWS README"
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
 
-G2CONF="${G2CONF}
+pkg_setup() {
+	G2CONF="${G2CONF}
 		$(use_enable accessibility all-themes)
 		--disable-test-themes
 		--enable-icon-mapping"
+}
 
 src_prepare() {
+	gnome2_src_prepare
+
 	# Fix bashisms, bug #256337
 	epatch "${FILESDIR}/${PN}-2.24.3-bashism.patch"