diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-02-13 23:09:57 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-02-13 23:09:57 +0000 |
| commit | f35d2663689a0ac6d31df30bfaf7f263821055ac (patch) | |
| tree | 4aa9d1fde4b1cc55230a68e6edf198abce4805b4 /x11-terms | |
| parent | Split dev-util/gtk-builder-convert out of gtk+-2.24.10-r1 to get rid of pytho... (diff) | |
| download | gentoo-2-f35d2663689a0ac6d31df30bfaf7f263821055ac.tar.gz gentoo-2-f35d2663689a0ac6d31df30bfaf7f263821055ac.tar.bz2 gentoo-2-f35d2663689a0ac6d31df30bfaf7f263821055ac.zip | |
Update deps for split gtk-builder-convert (bug #402905).
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/gnome-terminal/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild | 5 | ||||
| -rw-r--r-- | x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog index deeebbdf7f6e..6620c7e14f43 100644 --- a/x11-terms/gnome-terminal/ChangeLog +++ b/x11-terms/gnome-terminal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-terms/gnome-terminal -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.239 2011/10/30 02:01:30 tetromino Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.240 2012/02/13 23:09:57 tetromino Exp $ + + 13 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + gnome-terminal-2.32.1.ebuild, gnome-terminal-3.2.1.ebuild: + Update deps for split gtk-builder-convert (bug #402905). *gnome-terminal-3.2.1 (30 Oct 2011) diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild index ce6e24817992..4f6decda6ff8 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild,v 1.7 2011/03/23 07:38:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild,v 1.8 2012/02/13 23:09:57 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -23,6 +23,7 @@ RDEPEND=">=dev-libs/glib-2.25.12:2 x11-libs/libSM gnome-base/libgnome" DEPEND="${RDEPEND} + || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) sys-devel/gettext >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.9 diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild index dec9b6710e0d..2b1a02bde9b3 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild,v 1.1 2011/10/30 02:01:30 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild,v 1.2 2012/02/13 23:09:57 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.26.0:2 x11-libs/libICE" # gtk+:2 needed for gtk-builder-convert, bug 356239 DEPEND="${RDEPEND} - x11-libs/gtk+:2 + || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.9 >=app-text/gnome-doc-utils-0.3.2 |