Version bump. Include patches from r1. Updated translations.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 23 insertions, 45 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/Manifest b/x11-themes/gtk-engines/Manifest
index 46c56a751be8..7e5a52b11b21 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -4,20 +4,18 @@ Hash: SHA1
 AUX gtk-engines-2.18.3-fix-system-lua-check.patch 862 RMD160 c14e110e1c2f604e6b42d8034d78c6d29ca39428 SHA1 3c5d009bfe73237927bb0dbe78f3a815c485b1a3 SHA256 5d1ab916b9146859cbdde2af627d63c69faad41438fd747e14ca2476fd3ee9bb
 AUX gtk-engines-2.20.1-evolution-workaround.patch 1028 RMD160 0fee809fec9d95bfd1b1796559bbe01cd35fb930 SHA1 3e240d99c8de754768ae996103c43360c792d0c8 SHA256 22e11c338b4db573fe87a6c11c9bffd204780f27af81f39dbaf1c78080e61d40
 AUX gtk-engines-2.20.1-xfce-workaround.patch 1047 RMD160 a3889363c8884b27de5eb6d14383c77fd8a76f35 SHA1 b2de5c652bbf47f71e5b6dfaa873c55704bde054 SHA256 61cd87901804d9be6bc95694dfe4707c64f50954dca9b5a0ff75d380a875d1fb
-DIST gtk-engines-2.16.1.tar.bz2 588253 RMD160 72d84e5a4d1e32345a40249ead9579d3ee73badb SHA1 d2d3ba7377b72a54cee99cbc546e19b3fc508b41 SHA256 5ce5bd23df9c26444c92d415935622d5f1f7c1c9669ec5165607de05125dc2c1
-DIST gtk-engines-2.18.3.tar.bz2 605104 RMD160 b03ef6bbfd5b9dfd18c0b1d3586c084d5c51602e SHA1 f66efb8785b576126b5f57d99d985042b9614f5c SHA256 51593f77e5e425dccc3ee5b76cd81b4d706e04e3d9f3814679886fe015351975
 DIST gtk-engines-2.18.5.tar.bz2 675585 RMD160 34b47034302b18defdd2191bb9bea06b2ca4e614 SHA1 bc540837ec7aa81b155c46317aacb367c3b71314 SHA256 494db7876b8c69b760c097493e4c3566a71231c54a90eaa6ef9529884e2a9f12
 DIST gtk-engines-2.20.1.tar.bz2 679326 RMD160 336465821ded77e69d9cafe2cd07f3417dd97dc5 SHA1 908d24ae48e70a0ce2f047ba9f494f35153e3982 SHA256 c502ee4778e1a8e232f430fb575146a0880266471d19dbd78ee51eaa769da614
-EBUILD gtk-engines-2.16.1.ebuild 715 RMD160 6b84ee59d056edc716bbe9dc30577a17f0389041 SHA1 c3ecd3238725e4c6275e585c0141db1ba4c5e763 SHA256 d2431df4fbe9768012b07b63e194a223f169315a67bf009b07f432710eee7662
-EBUILD gtk-engines-2.18.3.ebuild 1069 RMD160 4609d1a9e01efd4f280e92af105af47cc8355628 SHA1 791f776594c6e08397db8c6164fe558cee726523 SHA256 89b2c5d7b060b6e3b6db9a6d880f0af8080a38f6a02a1df99e5f37c5fc506d81
+DIST gtk-engines-2.20.2.tar.bz2 688171 RMD160 941b71cd2346a349d89f68962c2ce28e3520297c SHA1 574c7577d70eaacecd2ffa14e288ef88fdcb6c2a SHA256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5
 EBUILD gtk-engines-2.18.5.ebuild 887 RMD160 f42fbb7385373422df8b2b51f3cc0154c2bfd895 SHA1 f1f335798125cfe300c76a66b467d44f488551be SHA256 836526209e2562edffbecc7eb05e592a0bb3fe324ab202ffd82234c5d5148bf3
 EBUILD gtk-engines-2.20.1-r1.ebuild 1173 RMD160 cecf0a6428d2cc03b1de5bbf1b6eaed04b5459a8 SHA1 12eb517328c9117d9f2f8b76cb719d8c5746db95 SHA256 b47f40366fb8463710ae79b02a88b66df5c3ba97dc1e9a6bd463962b4333d347
-MISC ChangeLog 22581 RMD160 ba01f364659a05a49964e8b717c393eb1a947025 SHA1 6f1c67a225e174ca1f3200f95690cb7910d46116 SHA256 fba1900a511d9a5b0a5a590cee3873f4b360b0ce7a8cd1b5cc3c731a8b912984
+EBUILD gtk-engines-2.20.2.ebuild 979 RMD160 04a13f5f1fede265208412b18fc14dc6cb1ab3b1 SHA1 76f1cf412ced1778427431f076b925e8e6e476aa SHA256 44803ea908e0f4943b6e6362c9721c9ab937861e3832729a08a65b011a49ec28
+MISC ChangeLog 22819 RMD160 f57a5e5539484173d909b458d529765f4c8f58d2 SHA1 605e1af679e14bd7f9893cb608e17acc39e75910 SHA256 1fcf57955e6179469c77ab924282a1fa4e5ba1ffc9d44c9b7d683da5c62b3b93
 MISC metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 SHA1 fefe96510715292236a409394ac78e1b092043bc SHA256 cfae48dc83100358d4370ba22eaa6284c74288b749e2f34525358e3627fa8a89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLyy4ACgkQcsIHjyDViGTtcwCglPnJ1tzSFUlh8swZsF4Q4d8o
-zAgAn3BWqV8udk+tbsFDsEeEwIFNKE7U
-=ZoI6
+iEYEARECAAYFAkyo/lsACgkQ1fmVwcYIWAaYMQCgnMsAymxVlBd3QGqVCxS+SpM5
+nQcAn17oBdlLCGZnmSNiIPj/3Ktvr+1J
+=Kelm
 -----END PGP SIGNATURE-----
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
 }