Version bump. Include patches from r1. Updated translations.

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

3 files changed, 17 insertions, 37 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index 1ae1c1d65c87..3637e8f28024 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.171 2010/09/11 18:36:11 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.172 2010/10/03 22:06:07 eva Exp $
+
+*gtk-engines-2.20.2 (03 Oct 2010)
+
+  03 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtk-engines-2.16.1.ebuild, -gtk-engines-2.18.3.ebuild,
+  +gtk-engines-2.20.2.ebuild:
+  Version bump. Include patches from r1. Updated translations.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org>
   gtk-engines-2.20.1-r1.ebuild:
diff --git a/x11-themes/gtk-engines/gtk-engines-2.16.1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.16.1.ebuild
deleted file mode 100644
index 439dfa086164..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.16.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.16.1.ebuild,v 1.11 2009/04/28 11:07:00 armin76 Exp $
-
-inherit gnome2
-
-DESCRIPTION="GTK+2 standard engines and themes"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2.12"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="--enable-animation --enable-lua"
-	use accessibility || G2CONF="${G2CONF} --disable-hc"
-}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.3.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild
index 3fb0891324a9..4a725143728a 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.18.3.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild
@@ -1,18 +1,19 @@
+
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.3.ebuild,v 1.9 2010/01/18 00:31:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.2.ebuild,v 1.1 2010/10/03 22:06:07 eva Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="GTK+2 standard engines and themes"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="accessibility lua"
 
 RDEPEND=">=x11-libs/gtk+-2.12
@@ -27,11 +28,8 @@ pkg_setup() {
 	G2CONF="${G2CONF} --enable-animation $(use_enable lua) $(use_with lua system-lua)"
 	use accessibility || G2CONF="${G2CONF} --disable-hc"
 }
-src_prepare() {
-	gnome2_src_prepare
-	# Fix typo in AM_CONDITIONNAL for system lua feature,
-	# upstream bug #594014.
-	epatch "${FILESDIR}"/${P}-fix-system-lua-check.patch
-	intltoolize --automake --copy --force || die "intltoolize failed"
-	eautoreconf
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die
 }