diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2010-11-08 22:43:29 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2010-11-08 22:43:29 +0000 |
| commit | 53c1acbf665db4b2821f7c36d1c84919c2abe98c (patch) | |
| tree | f0a8bcd65733c62b12079de0e2e7a8b35fb82696 | |
| parent | Replace dev-cpp/libpqpp dependency with native postgresql client libraries, b... (diff) | |
| download | gentoo-2-53c1acbf665db4b2821f7c36d1c84919c2abe98c.tar.gz gentoo-2-53c1acbf665db4b2821f7c36d1c84919c2abe98c.tar.bz2 gentoo-2-53c1acbf665db4b2821f7c36d1c84919c2abe98c.zip | |
Fix support for python interpreter not being python 2, bug #313451. Pin glib and gtk+ to slot 2.
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
| -rw-r--r-- | gnome-base/libglade/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/libglade/libglade-2.6.4.ebuild | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog index b0df63826bb7..1b58bd33dbd2 100644 --- a/gnome-base/libglade/ChangeLog +++ b/gnome-base/libglade/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/libglade -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.130 2009/10/11 02:46:15 leio Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.131 2010/11/08 22:43:29 eva Exp $ + + 08 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> libglade-2.6.4.ebuild: + Fix support for python interpreter not being python 2, bug #313451. Pin + glib and gtk+ to slot 2. 11 Oct 2009; Mart Raudsepp <leio@gentoo.org> -libglade-2.6.3.ebuild: Remove old diff --git a/gnome-base/libglade/libglade-2.6.4.ebuild b/gnome-base/libglade/libglade-2.6.4.ebuild index 19c87bf714de..d89aeb4979a6 100644 --- a/gnome-base/libglade/libglade-2.6.4.ebuild +++ b/gnome-base/libglade/libglade-2.6.4.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.7 2009/10/09 18:25:07 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.8 2010/11/08 22:43:29 eva Exp $ EAPI="2" +PYTHON_DEPEND="2" -inherit eutils gnome2 +inherit eutils gnome2 python DESCRIPTION="Library to construct graphical interfaces at runtime" HOMEPAGE="http://www.gnome.org/" @@ -14,16 +15,18 @@ SLOT="2.0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="doc" -RDEPEND=">=dev-libs/glib-2.10 - >=x11-libs/gtk+-2.8.10 +RDEPEND=">=dev-libs/glib-2.10:2 + >=x11-libs/gtk+-2.8.10:2 >=dev-libs/atk-1.9 - >=dev-libs/libxml2-2.4.10 - >=dev-lang/python-2.0-r7" + >=dev-libs/libxml2-2.4.10" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1 )" -DOCS="AUTHORS ChangeLog NEWS README" +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS README" + python_set_active_version 2 +} src_prepare() { # patch to stop make install installing the xml catalog @@ -37,6 +40,7 @@ src_prepare() { src_install() { dodir /etc/xml gnome2_src_install + python_convert_shebangs 2 "${D}"/usr/bin/libglade-convert } pkg_postinst() { |