From af2ddb93fc30821684a239311e5ecf2cccee0a0c Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Fri, 5 Nov 2010 18:56:21 +0000 Subject: Pin gtk+ dependency to slot 2. Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64 --- gnome-extra/at-spi/ChangeLog | 5 ++++- gnome-extra/at-spi/at-spi-1.32.0.ebuild | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'gnome-extra') diff --git a/gnome-extra/at-spi/ChangeLog b/gnome-extra/at-spi/ChangeLog index 15283e9d7b2c..45c0bd036d3f 100644 --- a/gnome-extra/at-spi/ChangeLog +++ b/gnome-extra/at-spi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-extra/at-spi # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.213 2010/10/17 15:04:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/ChangeLog,v 1.214 2010/11/05 18:56:21 eva Exp $ + + 05 Nov 2010; Gilles Dartiguelongue at-spi-1.32.0.ebuild: + Pin gtk+ dependency to slot 2. 17 Oct 2010; Raúl Porcel at-spi-1.30.1.ebuild: alpha/ia64/sh/sparc stable wrt #324077 diff --git a/gnome-extra/at-spi/at-spi-1.32.0.ebuild b/gnome-extra/at-spi/at-spi-1.32.0.ebuild index 84e77f3665e6..a930ca99c120 100644 --- a/gnome-extra/at-spi/at-spi-1.32.0.ebuild +++ b/gnome-extra/at-spi/at-spi-1.32.0.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/gnome-extra/at-spi/at-spi-1.32.0.ebuild,v 1.1 2010/10/12 18:12:17 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/at-spi/at-spi-1.32.0.ebuild,v 1.2 2010/11/05 18:56:21 eva Exp $ EAPI="3" GCONF_DEBUG="no" @@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="doc" RDEPEND=">=dev-libs/atk-1.29.2 - >=x11-libs/gtk+-2.19.7 + >=x11-libs/gtk+-2.19.7:2 >=gnome-base/libbonobo-1.107 >=gnome-base/orbit-2 >=dev-libs/dbus-glib-0.76 @@ -33,14 +33,15 @@ RDEPEND=">=dev-libs/atk-1.29.2 DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 - gnome-base/gnome-common - dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) x11-libs/libXt x11-proto/xextproto x11-proto/inputproto x11-proto/xproto" +# eautoreconf needs: +# gnome-base/gnome-common +# dev-util/gtk-doc-am # needs a live properly configured environment. Not really suited to # an ebuild restricted environment @@ -54,7 +55,7 @@ pkg_setup() { python_set_active_version 2 } -src_prepare () { +src_prepare() { gnome2_src_prepare # disable pyc compiling -- cgit v1.2.3-65-gdbad