New version for GNOME-2.22.2. Bug fixes and translation updates.

Package-Manager: portage-2.1.5.2

3 files changed, 21 insertions, 30 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index b13c9c5ccc68..c43418bd96b7 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.120 2008/05/05 13:31:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.121 2008/05/31 10:36:25 eva Exp $
+
+*gtk-engines-2.14.2 (31 May 2008)
+
+  31 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtk-engines-2.6.10.ebuild, -gtk-engines-2.10.2.ebuild,
+  +gtk-engines-2.14.2.ebuild:
+  New version for GNOME-2.22.2. Bug fixes and translation updates.
+  Clean up old revisions.
 
   05 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -gtk-engines-2.14.0.ebuild, gtk-engines-2.14.1.ebuild:
diff --git a/x11-themes/gtk-engines/gtk-engines-2.10.2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.14.2.ebuild
index 9b405e3fb162..bb049ac59366 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.10.2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.14.2.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.10.2.ebuild,v 1.10 2007/09/22 05:11:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.14.2.ebuild,v 1.1 2008/05/31 10:36:25 eva Exp $
 
-inherit gnome2
+inherit gnome2 virtualx
 
 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 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="accessibility static"
 
-RDEPEND=">=x11-libs/gtk+-2.10
+RDEPEND=">=x11-libs/gtk+-2.12
 	!<=x11-themes/gnome-themes-2.8.2"
 DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.31
 	>=dev-util/pkgconfig-0.9"
 
 DOCS="AUTHORS ChangeLog NEWS README"
@@ -23,3 +24,9 @@ pkg_setup() {
 	G2CONF="$(use_enable static) --enable-animation"
 	use accessibility || G2CONF="${G2CONF} --disable-hc"
 }
+
+src_test() {
+	# It seems Xvfb is necessary to avoid random failure in tests
+	# see upstream bug #530743
+	Xemake check || die "tests failed"
+}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.6.10.ebuild b/x11-themes/gtk-engines/gtk-engines-2.6.10.ebuild
deleted file mode 100644
index 62e4de18e59c..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.6.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 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.6.10.ebuild,v 1.3 2008/03/10 22:08:12 leio Exp $
-
-inherit gnome2
-
-DESCRIPTION="GTK+2 standard engines and themes"
-HOMEPAGE="http://www.gtk.org/"
-
-KEYWORDS="~mips"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	!<=x11-themes/gnome-themes-2.8.2"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	use accessibility || G2CONF="${G2CONF} --disable-hc"
-}